From: Colin Walters Date: Fri, 6 Nov 2009 19:55:03 +0000 (-0500) Subject: [overview] Port pane to CSS X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10675 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bc255a525fab492dc02914a25dd094c74dafb7ee;p=gnome-shell.git [overview] Port pane to CSS https://bugzilla.gnome.org/show_bug.cgi?id=600734 --- diff --git a/data/Makefile.am b/data/Makefile.am index 8c090c08f..1f5857d77 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,7 +16,6 @@ imagesdir = $(pkgdatadir)/images dist_images_DATA = \ add-workspace.svg \ app-well-glow.png \ - close.svg \ close-black.svg \ info.svg \ magnifier.svg \ @@ -25,6 +24,7 @@ dist_images_DATA = \ themedir = $(pkgdatadir)/theme dist_theme_DATA = \ theme/gnome-shell.css \ + theme/close.svg \ theme/scroll-button-down.png \ theme/scroll-button-down-hover.png \ theme/scroll-button-up.png \ diff --git a/data/close.svg b/data/close.svg deleted file mode 100644 index 0f40f495f..000000000 --- a/data/close.svg +++ /dev/null @@ -1,74 +0,0 @@ - - -image/svg+xml - - \ No newline at end of file diff --git a/data/theme/close.svg b/data/theme/close.svg new file mode 100644 index 000000000..0f40f495f --- /dev/null +++ b/data/theme/close.svg @@ -0,0 +1,74 @@ + + +image/svg+xml + + \ No newline at end of file diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index ec4cfa573..a1e49211b 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -137,6 +137,19 @@ StTooltip { font-weight: normal; } +.dash-pane { + background-color: rgba(0,0,0,0.95); + border: 1px solid #262626; + padding: 4px; + spacing: 4px; +} + +.dash-pane-close { + background-image: url("close.svg"); + width: 16px; + height: 16px; +} + /* LookingGlass */ #LookingGlassDialog diff --git a/js/ui/dash.js b/js/ui/dash.js index 06cfd9910..3a536ec34 100644 --- a/js/ui/dash.js +++ b/js/ui/dash.js @@ -50,13 +50,6 @@ const SECTION_INNER_SPACING = 8; const BROWSE_ACTIVATED_BG = new Clutter.Color(); BROWSE_ACTIVATED_BG.from_pixel(0x303030f0); -const PANE_BORDER_COLOR = new Clutter.Color(); -PANE_BORDER_COLOR.from_pixel(0x101d3cfa); -const PANE_BORDER_WIDTH = 2; - -const PANE_BACKGROUND_COLOR = new Clutter.Color(); -PANE_BACKGROUND_COLOR.from_pixel(0x000000f4); - const APPS = "apps"; const PREFS = "prefs"; const DOCS = "docs"; @@ -95,36 +88,29 @@ Pane.prototype = { _init: function () { this._open = false; - this.actor = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL, - background_color: PANE_BACKGROUND_COLOR, - border: PANE_BORDER_WIDTH, - border_color: PANE_BORDER_COLOR, - padding: DEFAULT_PADDING, - reactive: true }); + this.actor = new St.BoxLayout({ style_class: "dash-pane", + vertical: true, + reactive: true }); this.actor.connect('button-press-event', Lang.bind(this, function (a, e) { // Eat button press events so they don't go through and close the pane return true; })); - let chromeTop = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL, - spacing: 6 }); + let chromeTop = new St.BoxLayout(); - let closeIconUri = "file://" + global.imagedir + "close.svg"; - let closeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER, - closeIconUri, - 16, - 16); + let closeIcon = new St.Bin({ style_class: "dash-pane-close" }); closeIcon.reactive = true; closeIcon.connect('button-press-event', Lang.bind(this, function (b, e) { this.close(); return true; })); - chromeTop.append(closeIcon, Big.BoxPackFlags.END); - this.actor.append(chromeTop, Big.BoxPackFlags.NONE); + let dummy = new St.Bin(); + chromeTop.add(dummy, { expand: true }); + chromeTop.add(closeIcon, { x_align: St.Align.END }); + this.actor.add(chromeTop); - this.content = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL, - spacing: DEFAULT_PADDING }); - this.actor.append(this.content, Big.BoxPackFlags.EXPAND); + this.content = new St.BoxLayout({ vertical: true }); + this.actor.add(this.content, { expand: true }); // Hidden by default this.actor.hide(); @@ -200,7 +186,7 @@ function createPaneForDetails(dash, display) { if (index >= 0) { detailPane.destroyContent(); let details = display.createDetailsForIndex(index); - detailPane.content.append(details, Big.BoxPackFlags.EXPAND); + detailPane.content.add(details, { expand: true }); detailPane.open(); } else { detailPane.close(); @@ -228,7 +214,7 @@ ResultPane.prototype = { createPaneForDetails(this._dash, resultArea.display); - this.content.append(resultArea.actor, Big.BoxPackFlags.EXPAND); + this.content.add(resultArea.actor, { expand: true }); this.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) { resultArea.display.resetState(); }));